Auto merge of #1082 - alexcrichton:std-error, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 30 Dec 2014 03:47:46 +0000 (03:47 +0000)
committerbors <bors@rust-lang.org>
Tue, 30 Dec 2014 03:47:46 +0000 (03:47 +0000)

Trivial merge